css: Move _gtk_css_print_string around

Move this to a separate header, since it is not
parser functionality, and kill the duplicate
gtkcssparserprivate.h header.

diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c
index 667a68f8a9ccf65b5dc1782220dd6439ce4c28c8..06d1bdb4d250fabbbe656ddb8b244156d59b1cbf 100644 (file)
--- a/gsk/gskrendernodeparser.c
+++ b/gsk/gskrendernodeparser.c
@@ -32,6 +32,7 @@
 #include <gtk/css/gtkcss.h>
 #include "gtk/css/gtkcssdataurlprivate.h"
 #include "gtk/css/gtkcssparserprivate.h"
+#include "gtk/css/gtkcssserializerprivate.h"
 
 #ifdef CAIRO_HAS_SCRIPT_SURFACE
 #include <cairo-script.h>

diff --git a/gtk/css/gtkcssparserprivate.h b/gtk/css/gtkcssparserprivate.h
index 9239477020b576cc99acf8f4a6c3c7fb3377a58a..349ad6799927fbb7d12dc594b218a16a601d5a9e 100644 (file)
--- a/gtk/css/gtkcssparserprivate.h
+++ b/gtk/css/gtkcssparserprivate.h
@@ -151,9 +151,6 @@ gsize                   gtk_css_parser_consume_any              (GtkCssParser
                                                                  gsize                           n_options,
                                                                  gpointer                        user_data);
 
-
-void            _gtk_css_print_string             (GString               *str,
-                                                   const char            *string);
 G_END_DECLS
 
 #endif /* __GTK_CSS_PARSER_H__ */

diff --git a/gtk/css/gtkcssserializer.c b/gtk/css/gtkcssserializer.c
new file mode 100644 (file)
index 0000000..838a7fb
--- /dev/null
+++ b/gtk/css/gtkcssserializer.c
@@ -0,0 +1,68 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gtkcssserializerprivate.h"
+
+/* Escape a string so that it can be parsed
+ * as a css string again.
+ */
+void
+_gtk_css_print_string (GString    *str,
+                       const char *string)
+{
+  gsize len;
+
+  g_return_if_fail (str != NULL);
+  g_return_if_fail (string != NULL);
+
+  g_string_append_c (str, '"');
+
+  do {
+    len = strcspn (string, "\\\"\n\r\f");
+    g_string_append_len (str, string, len);
+    string += len;
+    switch (*string)
+      {
+      case '\0':
+        goto out;
+      case '\n':
+        g_string_append (str, "\\A ");
+        break;
+      case '\r':
+        g_string_append (str, "\\D ");
+        break;
+      case '\f':
+        g_string_append (str, "\\C ");
+        break;
+      case '\"':
+        g_string_append (str, "\\\"");
+        break;
+      case '\\':
+        g_string_append (str, "\\\\");
+        break;
+      default:
+        g_assert_not_reached ();
+        break;
+      }
+    string++;
+  } while (*string);
+
+out:
+  g_string_append_c (str, '"');
+}

diff --git a/gtk/css/gtkcssserializerprivate.h b/gtk/css/gtkcssserializerprivate.h
new file mode 100644 (file)
index 0000000..2d1a169
--- /dev/null
+++ b/gtk/css/gtkcssserializerprivate.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2020 Red Hat, Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen <mclasen@redhat.com>
+ */
+
+
+#ifndef __GTK_CSS_SERIALIZER_H__
+#define __GTK_CSS_SERIALIZER_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+void _gtk_css_print_string (GString    *str,
+                            const char *string);
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_SERIALIZER_H__ */

diff --git a/gtk/css/meson.build b/gtk/css/meson.build
index 00284baf3661928bd889d7b652b1d739745952a9..6b2456192866f2be63d270a767bfa51a8ec0262c 100644 (file)
--- a/gtk/css/meson.build
+++ b/gtk/css/meson.build
@@ -8,6 +8,7 @@ gtk_css_private_sources = files([
   'gtkcssdataurl.c',
   'gtkcssparser.c',
   'gtkcsstokenizer.c',
+  'gtkcssserializer.c',
 ])
 
 gtk_css_public_headers = files([

diff --git a/gtk/gtkcssarrayvalueprivate.h b/gtk/gtkcssarrayvalueprivate.h
index fb9fb376c07a7acdfc272c36c289a4a8741c5151..1f9f38b006d75347f51bbe02b8d4d0306b0136dc 100644 (file)
--- a/gtk/gtkcssarrayvalueprivate.h
+++ b/gtk/gtkcssarrayvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_ARRAY_VALUE_PRIVATE_H__
 #define __GTK_CSS_ARRAY_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 #include "gtktypes.h"
 

diff --git a/gtk/gtkcssbgsizevalueprivate.h b/gtk/gtkcssbgsizevalueprivate.h
index 5f31ff2208f146a474340595ebcf06b912935e6a..47e356ead69a45a1c9d0c73099f10f0d20a20eaa 100644 (file)
--- a/gtk/gtkcssbgsizevalueprivate.h
+++ b/gtk/gtkcssbgsizevalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_BG_SIZE_VALUE_PRIVATE_H__
 #define __GTK_CSS_BG_SIZE_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssimageprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/gtkcssbordervalueprivate.h b/gtk/gtkcssbordervalueprivate.h
index fe49904002565c652394ab58fde13f09ea20b2e2..0fcaaf7db702e87a7b08cacb238027ea23fda83f 100644 (file)
--- a/gtk/gtkcssbordervalueprivate.h
+++ b/gtk/gtkcssbordervalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_BORDER_VALUE_PRIVATE_H__
 #define __GTK_CSS_BORDER_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h
index 49387d2c439a8b6f1c76256d60881a4470d26975..f96f6f42342a0cb874cc7afe15aba94748c7e8bc 100644 (file)
--- a/gtk/gtkcsscolorvalueprivate.h
+++ b/gtk/gtkcsscolorvalueprivate.h
@@ -18,7 +18,9 @@
 #ifndef __GTK_CSS_COLOR_VALUE_PRIVATE_H__
 #define __GTK_CSS_COLOR_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcsscornervalueprivate.h b/gtk/gtkcsscornervalueprivate.h
index 59451a78406bbb67560732afef54f881ac8207b9..a364ce9df584c84f83fcdde2b3314ef787e69d22 100644 (file)
--- a/gtk/gtkcsscornervalueprivate.h
+++ b/gtk/gtkcsscornervalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_CORNER_VALUE_PRIVATE_H__
 #define __GTK_CSS_CORNER_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcsseasevalueprivate.h b/gtk/gtkcsseasevalueprivate.h
index 6b4dab3717fd1e3c5a6ee541180515a4acf13cb5..8aa2770feeac0536b3e3b038ff4cb7fac61e0c29 100644 (file)
--- a/gtk/gtkcsseasevalueprivate.h
+++ b/gtk/gtkcsseasevalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_EASE_VALUE_PRIVATE_H__
 #define __GTK_CSS_EASE_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssenumvalueprivate.h b/gtk/gtkcssenumvalueprivate.h
index 22bab5f1f4b230aa776d04d0c52c720f8caebdff..7ac181b7a9beed241e4cf86a1a3956bfafdfdea0 100644 (file)
--- a/gtk/gtkcssenumvalueprivate.h
+++ b/gtk/gtkcssenumvalueprivate.h
@@ -21,7 +21,9 @@
 #define __GTK_CSS_ENUM_VALUE_PRIVATE_H__
 
 #include "gtkenums.h"
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/gtkcssfiltervalueprivate.h b/gtk/gtkcssfiltervalueprivate.h
index b9eabaa237e1eee30998955ca0985d7709e3454c..6d76f906b7b9cd3a364edc315d8bc18832f2646f 100644 (file)
--- a/gtk/gtkcssfiltervalueprivate.h
+++ b/gtk/gtkcssfiltervalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_FILTER_VALUE_PRIVATE_H__
 #define __GTK_CSS_FILTER_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssfontfeaturesvalue.c b/gtk/gtkcssfontfeaturesvalue.c
index c5f79eff89fe0c0701624eed17453b4266a339b1..faedc8cf4403d77ac5a970a7fdfa9020d279d572 100644 (file)
--- a/gtk/gtkcssfontfeaturesvalue.c
+++ b/gtk/gtkcssfontfeaturesvalue.c
@@ -20,7 +20,9 @@
 #include "config.h"
 
 #include "gtkcsstypesprivate.h"
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssfontfeaturesvalueprivate.h"
 

diff --git a/gtk/gtkcssfontfeaturesvalueprivate.h b/gtk/gtkcssfontfeaturesvalueprivate.h
index f78a8cd1821f6f269791caa8631e793734fbe730..b0001da986f166a6baed152d686579a52bb19504 100644 (file)
--- a/gtk/gtkcssfontfeaturesvalueprivate.h
+++ b/gtk/gtkcssfontfeaturesvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_FONT_FEATURES_VALUE_PRIVATE_H__
 #define __GTK_CSS_FONT_FEATURES_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssfontvariationsvalue.c b/gtk/gtkcssfontvariationsvalue.c
index 174cacf4174bea75562b49d5e7bcfcc011acb4b1..2ecae30ab0004acb90e091c350501ca468d8c52e 100644 (file)
--- a/gtk/gtkcssfontvariationsvalue.c
+++ b/gtk/gtkcssfontvariationsvalue.c
@@ -19,7 +19,9 @@
 
 #include "config.h"
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssfontvariationsvalueprivate.h"
 

diff --git a/gtk/gtkcssfontvariationsvalueprivate.h b/gtk/gtkcssfontvariationsvalueprivate.h
index 90e0fd3a84ee1a12b88fb18a754ff368c7a2e21a..c4688481908ec7bc034e9ff4b396845bbf0e1f68 100644 (file)
--- a/gtk/gtkcssfontvariationsvalueprivate.h
+++ b/gtk/gtkcssfontvariationsvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_FONT_VARIATIONS_VALUE_PRIVATE_H__
 #define __GTK_CSS_FONT_VARIATIONS_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c
index 2fa93d25401604e63d310642deaee053b5b85097..debde7ee00739f1b282c3a33cc530076a8dbbb06 100644 (file)
--- a/gtk/gtkcssimageicontheme.c
+++ b/gtk/gtkcssimageicontheme.c
@@ -23,6 +23,7 @@
 
 #include <math.h>
 
+#include "gtk/css/gtkcssserializerprivate.h"
 #include "gtksettingsprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstyleproviderprivate.h"

diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h
index d4e4e669eabf0bb6a2935b6cba64d6663b4470c0..707c5d7648eff7213f957f5610912c6639985503 100644 (file)
--- a/gtk/gtkcssimageprivate.h
+++ b/gtk/gtkcssimageprivate.h
@@ -23,7 +23,9 @@
 #include <cairo.h>
 #include <glib-object.h>
 
-#include "gtk/gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtk/gtkcsstypesprivate.h"
 #include "gtk/gtksnapshot.h"
 #include "gtk/gtkstyleprovider.h"

diff --git a/gtk/gtkcsskeyframesprivate.h b/gtk/gtkcsskeyframesprivate.h
index 89de02536cdef36961b859090dbc122f193d9889..359184840adc0fcc11720cfc5ddaab789005fcaf 100644 (file)
--- a/gtk/gtkcsskeyframesprivate.h
+++ b/gtk/gtkcsskeyframesprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_KEYFRAMES_PRIVATE_H__
 #define __GTK_CSS_KEYFRAMES_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 #include "gtktypes.h"
 

diff --git a/gtk/gtkcssnumbervalueprivate.h b/gtk/gtkcssnumbervalueprivate.h
index bcac90e45e5be88a9d56c9a30acd0d30abf496e5..5ea9b8f63b1201f6411c2ae898db452c0552b7ef 100644 (file)
--- a/gtk/gtkcssnumbervalueprivate.h
+++ b/gtk/gtkcssnumbervalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_NUMBER_VALUE_PRIVATE_H__
 #define __GTK_CSS_NUMBER_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/gtkcsspalettevalueprivate.h b/gtk/gtkcsspalettevalueprivate.h
index b422494a8a6861ca2035d667bc75fcffce2c0be5..baf25b90e71a4f6dbdbf2b5f3c83172a5e0f9376 100644 (file)
--- a/gtk/gtkcsspalettevalueprivate.h
+++ b/gtk/gtkcsspalettevalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_PALETTE_VALUE_PRIVATE_H__
 #define __GTK_CSS_PALETTE_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
deleted file mode 100644 (file)
index bb5b0a8..0000000
--- a/gtk/gtkcssparser.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gtkcssparserprivate.h"
-
-void
-_gtk_css_print_string (GString    *str,
-                       const char *string)
-{
-  gsize len;
-
-  g_return_if_fail (str != NULL);
-  g_return_if_fail (string != NULL);
-
-  g_string_append_c (str, '"');
-
-  do {
-    len = strcspn (string, "\\\"\n\r\f");
-    g_string_append_len (str, string, len);
-    string += len;
-    switch (*string)
-      {
-      case '\0':
-        goto out;
-      case '\n':
-        g_string_append (str, "\\A ");
-        break;
-      case '\r':
-        g_string_append (str, "\\D ");
-        break;
-      case '\f':
-        g_string_append (str, "\\C ");
-        break;
-      case '\"':
-        g_string_append (str, "\\\"");
-        break;
-      case '\\':
-        g_string_append (str, "\\\\");
-        break;
-      default:
-        g_assert_not_reached ();
-        break;
-      }
-    string++;
-  } while (*string);
-
-out:
-  g_string_append_c (str, '"');
-}
-

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
deleted file mode 100644 (file)
index 68fa8a1..0000000
--- a/gtk/gtkcssparserprivate.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_CSS_PARSER_PRIVATE_H__
-#define __GTK_CSS_PARSER_PRIVATE_H__
-
-#include <gtk/gtkcssprovider.h>
-
-#include <gtk/css/gtkcss.h>
-#include "gtk/css/gtkcsstokenizerprivate.h"
-#include "gtk/css/gtkcssparserprivate.h"
-
-#endif /* __GTK_CSS_PARSER_PRIVATE_H__ */

diff --git a/gtk/gtkcsspositionvalueprivate.h b/gtk/gtkcsspositionvalueprivate.h
index fc87fbcbce481de0a25428ff8b2d12612bcdde24..2ef70df8d72cbe8b9541af8bf4b7da26128c14b6 100644 (file)
--- a/gtk/gtkcsspositionvalueprivate.h
+++ b/gtk/gtkcsspositionvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_POSITION_VALUE_PRIVATE_H__
 #define __GTK_CSS_POSITION_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index db84e1daef53ff43d18fd6d1d3697963e7bdded0..ebbc1a165a779b8ef42f92984a71db31e5a14f04 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -19,11 +19,13 @@
 
 #include "gtkcssproviderprivate.h"
 
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkbitmaskprivate.h"
 #include "gtkcssarrayvalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcsskeyframesprivate.h"
-#include "gtkcssparserprivate.h"
 #include "gtkcssselectorprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtksettingsprivate.h"

diff --git a/gtk/gtkcssrepeatvalueprivate.h b/gtk/gtkcssrepeatvalueprivate.h
index 7e8baa315f99eb584e93e8ae62a88694c20a3fcd..02665c5792b777def067626f6d9b0a1c737dccd3 100644 (file)
--- a/gtk/gtkcssrepeatvalueprivate.h
+++ b/gtk/gtkcssrepeatvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_REPEAT_VALUE_PRIVATE_H__
 #define __GTK_CSS_REPEAT_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkcssselectorprivate.h b/gtk/gtkcssselectorprivate.h
index 9cff8e90a89dcd5b1ba0bffa32904801a31f5248..af6781867f8c05fe908509db4b831578103063fa 100644 (file)
--- a/gtk/gtkcssselectorprivate.h
+++ b/gtk/gtkcssselectorprivate.h
@@ -18,9 +18,11 @@
 #ifndef __GTK_CSS_SELECTOR_PRIVATE_H__
 #define __GTK_CSS_SELECTOR_PRIVATE_H__
 
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtk/gtkcountingbloomfilterprivate.h"
 #include "gtk/gtkcsstypesprivate.h"
-#include "gtk/gtkcssparserprivate.h"
 
 #define GDK_ARRAY_ELEMENT_TYPE gpointer
 #define GDK_ARRAY_TYPE_NAME GtkCssSelectorMatches

diff --git a/gtk/gtkcssshadowvalueprivate.h b/gtk/gtkcssshadowvalueprivate.h
index c14d686566243592a83dd1c656e9c8da69786165..5784dfa5168e56c41f25275630d0381184b86133 100644 (file)
--- a/gtk/gtkcssshadowvalueprivate.h
+++ b/gtk/gtkcssshadowvalueprivate.h
@@ -23,9 +23,11 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkborder.h"
 #include "gtktypes.h"
-#include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 #include "gtkroundedboxprivate.h"
 #include "gtksnapshot.h"

diff --git a/gtk/gtkcssshorthandpropertyprivate.h b/gtk/gtkcssshorthandpropertyprivate.h
index 52b8a470a963bdac2a8dc231c949e271335196ff..4af065b26510ca5428353a21641103a61ff11e66 100644 (file)
--- a/gtk/gtkcssshorthandpropertyprivate.h
+++ b/gtk/gtkcssshorthandpropertyprivate.h
@@ -22,7 +22,9 @@
 
 #include <glib-object.h>
 
-#include "gtk/gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtk/gtkcssstylepropertyprivate.h"
 #include "gtk/gtkstylepropertyprivate.h"
 

diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c
index c211c33afa3642da296dd4d39f7ecdf6f902421c..269a86e717fa42873d9bcf72257fee5262452ae6 100644 (file)
--- a/gtk/gtkcssstringvalue.c
+++ b/gtk/gtkcssstringvalue.c
@@ -18,6 +18,7 @@
 #include "config.h"
 
 #include "gtkcssstringvalueprivate.h"
+#include "gtk/css/gtkcssserializerprivate.h"
 
 #include <string.h>
 

diff --git a/gtk/gtkcssstringvalueprivate.h b/gtk/gtkcssstringvalueprivate.h
index 5fb703b6e3b5f8f5b38df01cb5b2134dd6391e2a..8645077cd06de1ff533ef30d9aa5833869558683 100644 (file)
--- a/gtk/gtkcssstringvalueprivate.h
+++ b/gtk/gtkcssstringvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_STRING_VALUE_PRIVATE_H__
 #define __GTK_CSS_STRING_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index eabafee6df3eda893319d92baca1b4f2b90ce9a4..de7f2e3762c687a8f42d2561aa0aa013be03b51d 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -23,7 +23,9 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <math.h>
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkcsstransformvalueprivate.h b/gtk/gtkcsstransformvalueprivate.h
index 143dd87868808eac00a5ccc6c21c7906452fde9e..d6b8191d4b4c1ef90ba4856a8f72d87d9bedf89e 100644 (file)
--- a/gtk/gtkcsstransformvalueprivate.h
+++ b/gtk/gtkcsstransformvalueprivate.h
@@ -20,7 +20,9 @@
 #ifndef __GTK_CSS_TRANSFORM_VALUE_PRIVATE_H__
 #define __GTK_CSS_TRANSFORM_VALUE_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index d0c82ec72cb79b9249e0a9147fea31024c1f188a..e6fee266f06d910c0cf893158ed9f585f8472343 100644 (file)
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -20,7 +20,9 @@
 #include "gtkstylepropertyprivate.h"
 
 #include "gtkcssprovider.h"
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstypesprivate.h"

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 385913f83e6aecb59e409fa1c4fb8f89639019d7..b57331dd840d957862406ac6e18dc9d9efb091ec 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -18,7 +18,9 @@
 #ifndef __GTK_STYLEPROPERTY_PRIVATE_H__
 #define __GTK_STYLEPROPERTY_PRIVATE_H__
 
-#include "gtkcssparserprivate.h"
+#include <gtk/css/gtkcss.h>
+#include "gtk/css/gtkcsstokenizerprivate.h"
+#include "gtk/css/gtkcssparserprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkcssvalueprivate.h"
 

diff --git a/gtk/meson.build b/gtk/meson.build
index 3e18f05cb60065d7aac7e4e86b8030aa7caeb486..8edef68f8bc44c6aa479c3025fb3bb54408366b4 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -82,7 +82,6 @@ gtk_private_sources = files([
   'gtkcssnodestylecache.c',
   'gtkcssnumbervalue.c',
   'gtkcsspalettevalue.c',
-  'gtkcssparser.c',
   'gtkcsspositionvalue.c',
   'gtkcssrepeatvalue.c',
   'gtkcssselector.c',